From 56f9010bfa16eb7772cacbc40a669d856444e407 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 11 Jul 2016 18:28:07 +0100 Subject: [PATCH] hotplug/Linux: honour XEN_RUN_DIR MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Store various PID files under XEN_RUN_DIR. Note that this change the default location from /var/run to /var/run/xen. Signed-off-by: Wei Liu Acked-by: Roger Pau Monné Acked-by: Ian Jackson --- tools/hotplug/Linux/init.d/xencommons.in | 6 +++--- tools/hotplug/Linux/init.d/xendriverdomain.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in index 7b69fc254d..2d8f30b88a 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -27,8 +27,8 @@ xencommons_config=@CONFIG_DIR@/@CONFIG_LEAF_DIR@ test -f $xencommons_config/xencommons && . $xencommons_config/xencommons -XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid -QEMU_PIDFILE=/var/run/qemu-dom0.pid +XENCONSOLED_PIDFILE=@XEN_RUN_DIR@/xenconsoled.pid +QEMU_PIDFILE=@XEN_RUN_DIR@/qemu-dom0.pid shopt -s extglob # not running in Xen dom0 or domU @@ -70,7 +70,7 @@ do_start () { if [ -n "$XENSTORED" ] ; then echo -n Starting $XENSTORED... - $XENSTORED --pid-file /var/run/xenstored.pid $XENSTORED_ARGS + $XENSTORED --pid-file @XEN_RUN_DIR@/xenstored.pid $XENSTORED_ARGS else echo "No xenstored found" exit 1 diff --git a/tools/hotplug/Linux/init.d/xendriverdomain.in b/tools/hotplug/Linux/init.d/xendriverdomain.in index 8d4592a92a..c63060f62a 100644 --- a/tools/hotplug/Linux/init.d/xendriverdomain.in +++ b/tools/hotplug/Linux/init.d/xendriverdomain.in @@ -24,7 +24,7 @@ xendriverdomain_config=@CONFIG_DIR@/@CONFIG_LEAF_DIR@ test -f $xendriverdomain_config/xendriverdomain && . $xendriverdomain_config/xendriverdomain -XLDEVD_PIDFILE=/var/run/xldevd.pid +XLDEVD_PIDFILE=@XEN_RUN_DIR@/xldevd.pid # not running in Xen dom0 or domU if ! test -d /proc/xen ; then -- 2.30.2